Add a function to beep on a window. For X11, implement this with XkbBell.

2006-08-29  Matthias Clasen  <mclasen@redhat.com>

	* gdk/gdkwindow.h:
	* gdk/gdk.symbols:
	* gdk/directfb/gdkwindow-directfb.c (gdk_window_beep):
	* gdk/win32/gdkwindow-win32.c (gdk_window_beep):
	* gdk/quartz/gdkwindow-quartz.c (gdk_window_beep):
	* gdk/x11/gdkwindow-x11.c (gdk_window_beep): Add a function
	to beep on a window. For X11, implement this with
	XkbBell.  (#353455, Mariano Suárez-Alvarez)

diff --git a/ChangeLog b/ChangeLog
index 5bbbee890807cdfe42c3bddc1c0940d99d3408a9..30c0c237a6cfdbac4c6569a2c20d29c1e1ca2b58 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-08-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/gdkwindow.h: 
+       * gdk/gdk.symbols: 
+       * gdk/directfb/gdkwindow-directfb.c (gdk_window_beep): 
+       * gdk/win32/gdkwindow-win32.c (gdk_window_beep): 
+       * gdk/quartz/gdkwindow-quartz.c (gdk_window_beep): 
+       * gdk/x11/gdkwindow-x11.c (gdk_window_beep): Add a function
+       to beep on a window. For X11, implement this with
+       XkbBell.  (#353455, Mariano Suárez-Alvarez)
+       
 2006-08-29  Tor Lillqvist  <tml@novell.com>
 
        Remove support for Windows 9x/ME. GTK+ hasn't worked on Win9x

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 0a9adf60756ded0bb540efca5bfc88ac94d69d9f..a37b0a861da9021548299de1e6d97847df0170de 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/gdk-sections.txt: Add gdk_window_beep
+
 2006-08-25  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/question_index.sgml: Rewrite the answer for

diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt
index 900bde5072771c8ae6c614f88f9eee6b46e02edd..f0cbf61994e501be05c23b1659ec190c96591c2b 100644 (file)
--- a/docs/reference/gdk/gdk-sections.txt
+++ b/docs/reference/gdk/gdk-sections.txt
@@ -665,6 +665,7 @@ gdk_window_register_dnd
 gdk_window_begin_resize_drag
 gdk_window_begin_move_drag
 gdk_window_constrain_size
+gdk_window_beep
 
 <SUBSECTION>
 gdk_window_begin_paint_rect

diff --git a/gdk/directfb/gdkwindow-directfb.c b/gdk/directfb/gdkwindow-directfb.c
index edbc3901a2cfaf0c175af6b6d7601ce6f169d43f..a374400b325858d03664fe5ac9f1e3649b0cef00 100644 (file)
--- a/gdk/directfb/gdkwindow-directfb.c
+++ b/gdk/directfb/gdkwindow-directfb.c
@@ -2990,6 +2990,12 @@ gdk_window_impl_directfb_paintable_init (GdkPaintableIface *iface)
   iface->process_updates = gdk_window_impl_directfb_process_updates;
 }
 
+void
+gdk_window_beep (GdkWindow *window)
+{
+  gdk_display_beep (GDK_WINDOW_DISPLAY (window));
+}
+
 #define __GDK_WINDOW_X11_C__
 #include "gdkaliasdef.c"
 

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 52924ac4a314fd0c7fe503f8c6ccfac2528f1167..103ed0cb5edb295d811e09ab3f38baaed938e4bb 100644 (file)
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -738,6 +738,7 @@ gdk_window_set_focus_on_map
 gdk_window_set_icon_list
 gdk_window_set_icon
 gdk_window_set_icon_name
+gdk_window_beep
 gdk_window_iconify
 gdk_window_deiconify
 gdk_window_stick

diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index b0962bcfde8f1be072eab804753bf6a7c0bbe699..8380aa56e351e7555e3ac3de38ed72b0b23ed57d 100644 (file)
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -552,6 +552,7 @@ void              gdk_window_set_functions   (GdkWindow       *window,
 GList *       gdk_window_get_toplevels   (void);
 #endif
 
+void          gdk_window_beep            (GdkWindow       *window);
 void          gdk_window_iconify         (GdkWindow       *window);
 void          gdk_window_deiconify       (GdkWindow       *window);
 void          gdk_window_stick           (GdkWindow       *window);

diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index b3428f715210f4266c9e620a6821db5cd6419001..6fc58db27e114dbd6609b69b296a2aa6cff1f60a 100644 (file)
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -1993,3 +1993,9 @@ gdk_window_destroy_notify (GdkWindow *window)
    * -[GdkQuartzView dealloc], although I suspect that currently they leak
    * anyway. */
 }
+
+void 
+gdk_window_beep (GdkWindow *window)
+{
+  gdk_display_beep (GDK_WINDOW_DISPLAY (window));
+}

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 73486d9e77d251038b330c3529bbdd880ed1ab71..95f3f01725d86c80940d3fac84deb9e1110d5caa 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -3397,3 +3397,9 @@ gdk_window_configure_finished (GdkWindow *window)
 {
   g_return_if_fail (GDK_IS_WINDOW (window));
 }
+
+void
+gdk_window_beep (GdkWindow *window)
+{
+  gdk_display_beep (GDK_WINDOW_DISPLAY (window));
+}

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 06f5f8bdf9e4a529cb1f2dd72893dff799654a28..665793ad51862c2bf22920a43c9764ff225e4d31 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -29,6 +29,11 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
+
+#ifdef HAVE_XKB
+#include <X11/XKBlib.h>
+#endif
+
 #include <netinet/in.h>
 #include <unistd.h>
 
@@ -6311,5 +6316,28 @@ gdk_window_configure_finished (GdkWindow *window)
 #endif
 }
 
+/**
+ * gdk_window_beep:
+ * @window: a toplevel #GdkWindow
+ *
+ * Emits a short beep associated to @window in the appropriate
+ * display, if supported. Otherwise, emits a short beep on
+ * the display just as gdk_display_beep().
+ *
+ * Since: 2.12
+ **/
+void
+gdk_window_beep (GdkWindow *window)
+{
+#ifdef HAVE_XKB
+  XkbBell (GDK_WINDOW_XDISPLAY (window),
+           GDK_WINDOW_XID (window),
+           0,
+           None);
+#else
+  gdk_display_beep (GDK_WINDOW_DISPLAY (window));
+#endif
+}
+
 #define __GDK_WINDOW_X11_C__
 #include "gdkaliasdef.c"